From 846a6e8157555c2469f16878e9dcd114a8c0b638 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Timm=20B=C3=A4der?= Date: Fri, 12 Jan 2018 20:30:32 +0100 Subject: [PATCH] tooltip: Fold a function into its only caller --- gtk/gtktooltip.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c index dbca016ba4..952ea9587a 100644 --- a/gtk/gtktooltip.c +++ b/gtk/gtktooltip.c @@ -422,21 +422,6 @@ gtk_tooltip_trigger_tooltip_query (GdkDisplay *display) gtk_tooltip_handle_event_internal (GDK_MOTION_NOTIFY, window, x, y); } -/* private functions */ - -static void -gtk_tooltip_reset (GtkTooltip *tooltip) -{ - gtk_tooltip_set_markup (tooltip, NULL); - gtk_tooltip_set_icon (tooltip, NULL); - gtk_tooltip_set_tip_area (tooltip, NULL); - - /* See if the custom widget is again set from the query-tooltip - * callback. - */ - tooltip->custom_was_reset = FALSE; -} - static void gtk_tooltip_window_hide (GtkWidget *widget, gpointer user_data) @@ -788,7 +773,15 @@ gtk_tooltip_run_requery (GtkWidget **widget, gboolean has_tooltip = FALSE; gboolean return_value = FALSE; - gtk_tooltip_reset (tooltip); + /* Reset tooltip */ + gtk_tooltip_set_markup (tooltip, NULL); + gtk_tooltip_set_icon (tooltip, NULL); + gtk_tooltip_set_tip_area (tooltip, NULL); + + /* See if the custom widget is again set from the query-tooltip + * callback. + */ + tooltip->custom_was_reset = FALSE; do { -- 2.30.2